feat: add token usage tracking to OpenAI adapter #7900
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- Modified OpenAI adapter to properly handle and emit usage chunks in streaming responses - Added logic to store usage chunks and emit them at the end of the stream - Verified Anthropic and Gemini adapters already have complete token usage implementations - Added comprehensive tests for token usage tracking across all three providers - All tests passing with provided API keys 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <[email protected]>
sestinj
requested review from
Patrick-Erichsen
and removed request for
a team
![cubic-dev-ai[bot]](https://avatars.githubusercontent.com/in/1082092?s=60&v=4){kind=small}
There was a problem hiding this comment.
1 issue found across 3 files
Prompt for AI agents (all 1 issues)
Understand the root cause of the following 1 issues and fix them.
<file name="packages/openai-adapters/src/test/token-usage.test.ts">
<violation number="1" location="packages/openai-adapters/src/test/token-usage.test.ts:115">
Overwriting `global.fetch` without restoring leaves the mock active for subsequent tests. Please store the original fetch and restore it in afterEach/afterAll (or use `vi.spyOn`) so other suites keep the real implementation.</violation>
</file>
React with 👍 or 👎 to teach cubic. Mention @cubic-dev-ai to give feedback, ask questions, or re-run the review.
| }), | ||
| }; | ||
|
|
||
| global.fetch = vi.fn().mockResolvedValue(mockResponse); |
There was a problem hiding this comment.
Overwriting global.fetch without restoring leaves the mock active for subsequent tests. Please store the original fetch and restore it in afterEach/afterAll (or use vi.spyOn) so other suites keep the real implementation.
Prompt for AI agents
Address the following comment on packages/openai-adapters/src/test/token-usage.test.ts at line 115:
<comment>Overwriting `global.fetch` without restoring leaves the mock active for subsequent tests. Please store the original fetch and restore it in afterEach/afterAll (or use `vi.spyOn`) so other suites keep the real implementation.</comment>
<file context>
@@ -0,0 +1,353 @@
+ }),
+ };
+
+ global.fetch = vi.fn().mockResolvedValue(mockResponse);
+
+ const api = new AnthropicApi({ apiKey: "test", provider: "anthropic" });
</file context>
✅ Addressed in 6febaa7
dosubot
bot
added
the
size:L
Patrick-Erichsen
previously approved these changes
Oct 1, 2025
dosubot
bot
added
size:M
github-actions
bot
added
the
tier 2
|
🎉 This PR is included in version 1.24.0 🎉 The release is available on: Your semantic-release bot 📦🚀 |
|
🎉 This PR is included in version 1.28.0 🎉 The release is available on: Your semantic-release bot 📦🚀 |
|
🎉 This PR is included in version 1.2.0 🎉 The release is available on: Your semantic-release bot 📦🚀 |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Changes
chatCompletionStreammethod to handle usage chunks that arrive at the end of the streamexpectUsage: trueflagTest Plan
Linear Issue
CON-3935
🤖 Generated with Claude Code
Summary by cubic
Adds token usage tracking to the OpenAI adapter and defers the usage event until after all streamed content. Aligns OpenAI with Anthropic and Gemini so all providers report prompt, completion, and total tokens (CON-3935).